Merge remote-tracking branch 'upstream/master' into clean
authorMichael Wozniak <github@koh.ms>
Sun, 10 Nov 2013 22:16:09 +0000 (17:16 -0500)
committerMichael Wozniak <github@koh.ms>
Sun, 10 Nov 2013 22:16:09 +0000 (17:16 -0500)

Trivial merge