Merge branch 'master' into GA-Panel-UI

Conflicts:
Source/WAVED.js
Source/main.js