Merge remote-tracking branch 'origin/0.12' into devel-0.13