Updated to upstream's latest version (03/28/2014)