Merge branch 'master' into iscsi-update