Synchronized with the official repository (August 27, 2014)