Merged version constants, incremented to 1.2.1