Latest merge with 'git.openslx.org/openslx-ng/tm-scripts' on 23.12.16
Commit:	f5a59daf8d70a9027118292cd40b18c221897408