Merged from master for 1.6 updates.