removed incompatible changes inherited from master
Merge branch 'grizzly/rrivsmerge' of https://github.com/bigswitch/quantum into grizzly/rrivsmerge