v1.6.1
35498041 · Merge branch 'hotfix-1.6.1' · Jul 18, 2016