Merge remote-tracking branch 'remotes/devicehive/master' into stable