This fix has been merged into Master branch.
@jonharnew If you are happy to switch branches and pull in the latest changes from maser branch could you confirm issue has been fixed for you:
Please ensure you run a full EmonCMS update from the admin page before running these commands
cd /var/www/emoncms
git pull
git checkout master
git pull origin master