Get Framework and Pro back in sync
Merge branch 'release' into master