Merge "Use feature test rather than version check"
authorAaron Schulz <aschulz@wikimedia.org>
Wed, 22 Jul 2015 20:10:10 +0000 (20:10 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 22 Jul 2015 20:10:10 +0000 (20:10 +0000)

Trivial merge