Synchronized with the official repository (July 20, 2014)