Development @ aed7c82

Development Branch @ aed7c82 is ready for merge.  This will need testing, but should be fine.  With this merge, we are build passing again.