Synchronized with the official repository (August 11, 2014)