Synchronized with the official repository (July 15, 2014)