Imported Upstream version 4.0.13
Merge tag 'upstream/4.0.13'

Upstream version 4.0.13
Update locations file
Change files location
Imported Upstream version 4.0.14
Merge tag 'upstream/4.0.14'

Upstream version 4.0.14
Update changelog