merge master into dev (version on dev is dev-SNAPSHOT).