ASome stuff
Merge branch 'rel-1.2'