Use "define" instead of "const" outside classes
Merge branch 'master' into live