Merge "Removed accidentally added files" into devel/master