revert to 04.06.2014
Merge remote-tracking branch 'origin/master'