Merge development -> master, replace "development" in paths with "master"