Fixes #883
Merge branch '1.2.x'