awesomeness
Merge branch 'release/1.2'