Merge branch/2014-04-17/describe into the master sources.