Synchronized with the official repository (July 8, 2014)