Closes #166
Fixes #167
Merge branch 'master' into 2.5