Synchronized with the official repository (July 13, 2014)