Revert "Revert "201402 upgrade merge + versioning""

This reverts commit d32dfa5b3efece72a6425137c80a12e87569f2ed.