Merge with master for a couple more fixes.