Merge remote-tracking branch 'upstream/master'
authorrupertbaxter2 <rupertbaxter2@yahoo.com>
Sat, 16 Aug 2014 10:51:51 +0000 (03:51 -0700)
committerrupertbaxter2 <rupertbaxter2@yahoo.com>
Sat, 16 Aug 2014 10:51:51 +0000 (03:51 -0700)

Trivial merge