2330: Hiding advanced keyboard shortcuts for now
Updated integration repo
Ooops, fixed the pathspec that broke jenkins tests, silly me
Merge branch 'staging' into dev