Updated code after feedback from code review issue #740
Merge branch 'master' of https://github.com/lindenlab/desura-app