Fixed a minor problem with the post build
Merge branch 'v3.0'