Fast-forwarding Sean’s local copy
Merge branch 'master' of http://github.com/su2code/SU2
Merge branch 'master' of http://github.com/su2code/SU2