Merge remote-tracking branch 'jfirebaugh/legacy-params'
authorTom Hughes <tom@compton.nu>
Mon, 2 Dec 2013 20:29:34 +0000 (20:29 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 2 Dec 2013 20:29:34 +0000 (20:29 +0000)

Trivial merge