Stand 17.11.2014
Merge remote-tracking branch 'origin/master'