Bulk commit of intermediate updates.
Merge remote-tracking branch 'origin/master'

Merging master with local.