Synchronized with the official repository (August 2, 2014)