Synchronized with the official repository (July 25, 2014)