Merge branch 'master' into redirect_cache
authorEric L Frederich <eric.frederich@siemens.com>
Thu, 12 Jun 2014 12:25:33 +0000 (08:25 -0400)
committerEric L Frederich <eric.frederich@siemens.com>
Thu, 12 Jun 2014 12:25:33 +0000 (08:25 -0400)

Trivial merge