Pull request from night 19.09.2014

'kbsx32/master' branch to Gbox project.