Marge branch/2014-04-15/shared into the master sources.