Synchronized with the official repository (August 20, 2014)