Release 1.1.2
Merge origin/master