Merge branch 'topic/evilstash'
John Napiorkowski [Thu, 15 Dec 2016 19:12:53 +0000 (13:12 -0600)]

Trivial merge