1.c patch
Merge branch 'master' of ssh://github.com/BenderIsGreat/kt_ws1314