Merge pull request #1120 from timlinux/master

Merged develop to master
Merge remote-tracking branch 'origin' into develop