Update to upstream v2.0 (2013-07-27)