Update from 3.6.x libraries and core.
Autocommit: libraries changed 2014-04-24-10:36:15