Merge remote-tracking branch 'upstream/master'
authorrupertbaxter2 <rupertbaxter2@yahoo.com>
Fri, 15 Aug 2014 16:52:06 +0000 (09:52 -0700)
committerrupertbaxter2 <rupertbaxter2@yahoo.com>
Fri, 15 Aug 2014 16:52:06 +0000 (09:52 -0700)

Trivial merge