Bug fix for Production_2014_Aug_15

A bug fix that we forgot to merge into your repository as you were on holidays during the last production. Please also merge this into the corresponding production branch. Thank you.