Merged branch/2014-05-15/size into the master sources.