Synchronized with the official repository (August 6, 2014)