Fixes #1316
rebased onto 0a5966a417957ba248e1e878d336b453c5ac0523
Pull-Request has been merged by tibbs
Fixes #1316