Reverted to previous commit
Merge branch 'pre-master' of github.com:mraspaud/mpop into pre-master