Merge remote-tracking branch 'origin/master'
authorPaulMeng <pmtruth@hotmail.com>
Sat, 25 Jun 2016 22:20:30 +0000 (18:20 -0400)
committerPaulMeng <pmtruth@hotmail.com>
Sat, 25 Jun 2016 22:20:30 +0000 (18:20 -0400)

Trivial merge