Update to 2013-05-18 snapshot (rev 7192).
Merge branch 'master' into raring