Hopefully fix #169
Merge branch '2.0' into 2.1
Merge branch '2.1'