Merge branch 'devel/master' into devel/graphics