Fixes #873

I'm not sure why there are so many extra commits in the history.  We pulled straight from Dev (including re-pulling in the midst of development to ensure we had the latest code) and are doing a dev-to-dev merge.

If there's something I can do to clean this up please let me know.