Merge branch 'master' into develop
quick fix (and check) for 0.16 and higher
Merge branch 'develop'
icons update, better shutdown/reboot
Merge branch 'develop'