Merge branch 'master' into devel
13072014-1803
Merge branch 'devel'