Version bumped to 1.1
Merge remote-tracking branch 'origin/dev' into dev
Version set to 1.1