Merge from master for misc fixes.