Fixes  05.12.2013 11:31
Merge remote-tracking branch 'origin/master'