Merge branch 'RsrchBoy-topic/parallelize-tests'
John Napiorkowski [Tue, 21 Apr 2015 19:48:28 +0000 (14:48 -0500)]

Trivial merge