fe608dfc511ce5f9ea5ab9c698d2ff0aa320b427
195 commits (jmvalin@jmvalin.ca)
10 commits (david@rowetel.com)