Merge branch 'devel'
Merge branch 'devel'
Merge remote-tracking branch 'upstream/master' into devel