Merge branch 'master' into gdev-axe
gdev: bugfix
Merge remote-tracking branch 'origin/gdev-axe'