Changes made pre-alpha demo being committed now.
Merge remote-tracking branch 'origin/master'