merge branch "dev" into master.