Merge pull request #652 from abeloin/master

Linux fixes
This commit is contained in:
Luke 2013-12-25 20:07:29 -08:00
commit c9b835f44e