Merge branch 'topic/debug_warnings'
John Napiorkowski [Mon, 4 Apr 2016 16:56:27 +0000 (11:56 -0500)]

Trivial merge