No more infinite loops :-(
Merge branch 'master' of https://github.com/daxtens/planyourpicnic

Conflicts: