Merge branch 'master' into console #69

Closed ibinti closed 8 years ago