Merge branch '3021-more-phantomjs' refs #3021
authorTom Clegg <tom@curoverse.com>
Wed, 7 Jan 2015 17:14:42 +0000 (12:14 -0500)
committerTom Clegg <tom@curoverse.com>
Wed, 7 Jan 2015 17:14:42 +0000 (12:14 -0500)

Trivial merge