Merge remote-tracking branch 'upstream/master'
authorrupertbaxter2 <rupertbaxter2@yahoo.com>
Tue, 19 Aug 2014 14:15:33 +0000 (07:15 -0700)
committerrupertbaxter2 <rupertbaxter2@yahoo.com>
Tue, 19 Aug 2014 14:15:33 +0000 (07:15 -0700)

Trivial merge