First pull request! (SFX-8 merge)

Changes were first made to 'master', then merged into 'SFX-8'. This is the 'SFX-8' pull request.