Merge branch 'seife-master'

(cherry picked from commit 9250fae9121182d12d9a3d58610cb99aeecd7899)
Signed-off-by: Sascha 'InuSasha' Kuehndel <inu@inusasha.de>
add '+scr' to version number