Letzter Stand
Merge branch 'master' into 20140923_old_master