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

Trivial merge