Merge branch 'master' of https://github.com/pheelixx/Redux
Merge branch 'master' of https://github.com/pheelixx/Redux