Merge remote-tracking branch 'upstream/master'
authorrupertbaxter2 <rupertbaxter2@yahoo.com>
Wed, 13 Aug 2014 23:07:58 +0000 (16:07 -0700)
committerrupertbaxter2 <rupertbaxter2@yahoo.com>
Wed, 13 Aug 2014 23:07:58 +0000 (16:07 -0700)

Trivial merge