FIX #1057 - Typo in PR
Merge branch 'master' of github.com:ArchipelProject/Archipel into Pillow