Revert "Revert "Revert "201402 upgrade merge + versioning"""

This reverts commit ca2f74049306fd0f0c734320925fffd902ce4e2a.