Merge branch 'release/0.14' into develop
Comment out the "branched" stuff.
Also comment out f21 artifact stuff now that the release is out.
0.15
Merge branch 'release/0.15'