Merge branch 'prereq'
Samuel Kaufman [Fri, 4 Dec 2015 15:54:31 +0000 (15:54 +0000)]

Trivial merge