Reordered something. Not at all
Merge branch 'master' of https://github.com/steveoro/goggles