Merge branch 'bug-16060-IntegrationBranch-2014-01'
Signed-off-by: Alfred Franz <a.franz@dkfz-heidelberg.de>