Small optimizations.
Merge remote-tracking branch 'origin/master'
Synced with remote working copy.