Tom Clune - 2016-09-05

Sorry for the delay. Somehow I failed to check patch submissions on the web site for quite some time. (I.e. somehow I was not receiving emails informing me of their presence.)
Should have this committed on the master by the end of the day. Just waiting on regression tests.