Nachlese 11.1.2014

Signed-off-by: Maximilian Güntner <maximilian.guentner@gmail.com>