Update 2.3.1 from Kyoma

Author René Welbers <git@gecko-development.com>
Author date 2016-03-15 18:50:46
Author local date 2016-03-15 19:50:46 +0100
Committer René Welbers <git@gecko-development.com>
Committer date 2016-03-15 18:50:46
Committer local date 2016-03-15 19:50:46 +0100
Commit 31313242cdc19a115197e4c7c79361603ca5527c
Tree a3e8169348a330aa2c638aaffe506b054ff097f7
Parent bc91a538967adda51b76829ba08172b0b3482f67
Update 2.3.1 from Kyoma