sync to hg changeset: http://mercurial.mcs.anl.gov/ad/angel/rev/b39b3ee16224
Authored by: jean_utke 2014-03-13
Parent: [r89]
