Sync devel with master

These commits were merged with master by mistake; they should have been merged with devel.