Andy's changes first night
End of first night push
Merge branch 'sid_dev'
Merge branch 'master' into sid_dev