fix features conflict
merge master
Merge branch '7.x-2.x' of github.com:bw411/dcco into 7.x-2.x