Adding hotfix into develop branch.

Signed-off-by: Brad Davies <brad93@gmx.com>
Merge branch 'develop'