Release 1.2.2
Merge in latest changes from develop
Update package