Merge pull request #292 from ctrlcctrlv/master
authorThomasV <thomasv1@gmx.de>
Tue, 10 Sep 2013 21:36:10 +0000 (14:36 -0700)
committerThomasV <thomasv1@gmx.de>
Tue, 10 Sep 2013 21:36:10 +0000 (14:36 -0700)
Fix some bugs I found in 1.9


Trivial merge