Update with recent fixes from @davidcarlisle

Fixes #1024
This commit is contained in:
Peter Krautzberger 2015-02-17 11:02:36 +01:00 committed by Davide P. Cervone
parent f87cb5cf42
commit 627ab61df8

File diff suppressed because one or more lines are too long