Merge branch 'cventers-execute_exception'
John Napiorkowski [Wed, 8 Jun 2016 14:37:13 +0000 (09:37 -0500)]

Trivial merge