Fixes #477.
Merge branch '2.0'