2.1.2570
Revert "2.1.2570"

This reverts commit 0ebc4b55850ad5d52a9a86c3cb8338ce9943cf6b.
Merge branch 'master' of https://github.com/pixelandtonic/Craft-Release
2.1.2570