Synchronized with the official repository (October 17, 2014)