Merge branch 'master' into debian

Conflicts:
	units/var-lock.mount

diff --cc units/var-lock.mount
index 6f5d15bc0609543eb54bb9e79d57b01cea669c2a,0ea2599b71793a24d3f65347a0b3c4a58d22b7c1..bd5b8e3f1286d4c24611eef768539129488ba56b
--- 1/units/var-lock.mount
--- 2/units/var-lock.mount
+++ b/units/var-lock.mount
@@@ -13,4 -13,4 +13,4 @@@ Before=local-fs.targe
  What=tmpfs
  Where=/var/lock
  Type=tmpfs
- Options=mode=1775
 -Options=mode=775,gid=lock,nosuid,nodev,noexec
++Options=mode=1775,nosuid,nodev,noexec