v1.1.6
Merge branch 'public_master' into release