Pre-release Merge

Dev is in a stable state - such that it can be dragged into master so we are no longer 140 commits ahead of master and all of our contributions count.