Merge commit for debbugs:17755
authorKelvin White <kelvin.white77@gmail.com>
Thu, 19 Jun 2014 17:00:00 +0000 (13:00 -0400)
committerKelvin White <kelvin.white77@gmail.com>
Thu, 19 Jun 2014 17:00:00 +0000 (13:00 -0400)

Trivial merge