cleaned up some debugging noise
Merge remote branch 'wagn/develop' into develop