* add missing files
Merge remote-tracking branch 'origin/master' into v1.5