Merge branch '7846-magic-invalidate-entry' closes #7846
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 21 Jan 2016 21:49:45 +0000 (16:49 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 21 Jan 2016 21:49:45 +0000 (16:49 -0500)

Trivial merge