Merge remote-tracking branch 'origin/pab/devel' into master