Dev Update

Update my Dev repo to bs12's dev post master merge. Should allow pull
request to automerge now.