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