769ad8b22407094a1def08c2e76b98d9e5f6a748 | Author: Richard Wilkes <wilkes@me.com> | 2018-10-17 16:26:04-07:00 Prevent infinite loop (#1219)