One minor stylistic change.
Merge remote-tracking branch 'origin/master'
Moved to ./unused.