7acd45 - Some bugfixes (sync with upstream)

Authored and Committed by cassmodiah 9 years ago
file modified
+48 -2