Bugfixes for 1.6

Author katkat42 <johannsn@blindbox.com>
Author date 2015-03-05 00:41:37
Author local date 2015-03-04 18:41:37 -0600
Committer katkat42 <johannsn@blindbox.com>
Committer date 2015-03-05 00:41:37
Committer local date 2015-03-04 18:41:37 -0600
Commit 0b60642b7c858081d952f4310fa28a04c2c10fd6
Tree e10aeb9a3a236a822dd590d99d7fe6653b929ae1
Parent 009d216d9cd5d3ae6821a0cdcec301af99a0db0d
Bugfixes for 1.6