make sure ordering is consistent in rebuild
Merge branch 'modules' of https://github.com/Pinoccio/library-pinoccio into modules