Synchronized with the official repository (October 16, 2014)