new wave august 2014
Revert "new wave august 2014"

This reverts commit 2077dc492fae7ac6523016ba9f0ce6f55b605880.
Merge remote-tracking branch 'origin/master'