Merge remote-tracking branch 'upstream/master'
authorRene Rheaume <rene.rheaume@gmail.com>
Sat, 9 Aug 2014 00:18:44 +0000 (20:18 -0400)
committerRene Rheaume <rene.rheaume@gmail.com>
Sat, 9 Aug 2014 00:18:44 +0000 (20:18 -0400)

Trivial merge