Merge pull request #67 from plieven/for-1.9.3
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Sun, 16 Mar 2014 20:43:04 +0000 (13:43 -0700)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Sun, 16 Mar 2014 20:43:04 +0000 (13:43 -0700)
For 1.9.3


Trivial merge