Bring master up to build against svn circa {2014-05-01}