fix paths
remove files from 'master' before merge
Merge stripped branch 'master'

* commit '2b12912796ba8d1657d471ed955ccfe21ffb25af':
  remove files from 'master' before merge
  fix paths