Fixes #1314
Metadata Update from @mikem: - Pull-request tagged with: testing-ready
:thumbsup:
rebased onto 33b6c07d987f207ad663364139e811858b364e18
Commit d91d2290 fixes this pull-request
Pull-Request has been merged by mikem
Metadata Update from @jcupova: - Pull-request tagged with: testing-done
Fixes #1314