Allow nesting of calls to Package#ordered().
Merge branch 'master' into version