Release v1.2.0
Merge into master
Increased version for development