Merge branch 'hotfix/no-ap-vlan'
lime-proto-bmx6: removed wrong unuseful line
Merge branch 'master' into develop