Synchronized with the official repository (July 22, 2014)