Merge: model_collect: collect more things
authorJean Privat <jean@pryen.org>
Tue, 10 Oct 2017 16:52:04 +0000 (12:52 -0400)
committerJean Privat <jean@pryen.org>
Tue, 10 Oct 2017 16:52:04 +0000 (12:52 -0400)
A lot of new shortcuts.

Pull-Request: #2560


Trivial merge