Updated to upstream version 2014-04-04