Upgraded to upstream version 2014-02-01
Merge branch 'upstream'