Pre-submission changes.
Merge remote-tracking branch 'origin/master'
Ready to go on my side.