Synchronized with the official repository (August 8, 2014)