Fixes bug part of #839
Merge branch '1.5'