merging develop into crichton-demo

merging `develop` branch into `crichton-demo` branch...
for SQA testing...

(_hopefully I did this correctly, and it works..._)

Please review and let me know if any questions...  Thanks!