1.6.0
1f70857d · Merge branch 'beatrice' into 'master' ·