21.03.2013
Stefan: 21.03.2013
Merge remote-tracking branch 'upstream/master'