Fixes #1316
Metadata Update from @mikem: - Pull-request tagged with: testing-ready
:thumbsup:
Metadata Update from @jcupova: - Pull-request tagged with: testing-done
Commit 0c2f0ea7 fixes this pull-request
Pull-Request has been merged by mikem
Fixes #1316