Synchronized with the official repository (August 25, 2014)