Remove automatic SVN revision variables
Merge branch 'master' into testing