Merging changes from master. See master for logs.