Synchronized with the official repository (October 8, 2014)