Synchronized with the official repository (October 24, 2014)