Updated to upstream version 2013-02-15