Merge pull request #652 from larsmans/fixes
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 22 Sep 2015 15:01:59 +0000 (10:01 -0500)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 22 Sep 2015 15:01:59 +0000 (10:01 -0500)
Tiny fixes


Trivial merge