Pre-Merge Commit - Tuesday, October 7
Merge branch 'misc'
Trying to merge to master

Merge #1 for SNPPR project
This is the 3rd branch merging today, after Satinder (FrontEnd) and Ian (Controller_Features)