Fix for http://jira.tizzit.org/jira/browse/TIZZIT-447
Merge branch 'master' of github.com:tizzit/tizzit