Merge branch 'dev' into 'master'

mentioned in commit c3f504c8

mentioned in commit 9711fddc

mentioned in commit a996f45e

mentioned in commit 5a9c357d

mentioned in commit efcd434a

mentioned in commit ef49a048

mentioned in commit e6f410ae

mentioned in commit e0b5dc75

mentioned in commit 72636eea

mentioned in commit b0e2473f

mentioned in commit 9e14fce3

mentioned in commit 03964245

mentioned in commit 72357189

mentioned in commit 0fafa412

mentioned in commit e008e0dc

mentioned in commit 7b957052

mentioned in commit 3369cc80