Merge remote-tracking branch 'upstream/master'
authorThomas Daley <tuluse@yahoo.com>
Sun, 28 Feb 2016 02:45:25 +0000 (20:45 -0600)
committerThomas Daley <tuluse@yahoo.com>
Sun, 28 Feb 2016 02:45:25 +0000 (20:45 -0600)

Trivial merge