Merge branch 'master' into debian

Update to v37

Conflicts:
	units/remount-rootfs.service

diff --cc src/service.c
Simple merge

diff --cc units/remount-rootfs.service
index 6dbcaeb701091ecea9803f920193688396ae4773,89a16c8b2666c65850def8f08497d9b3d98b356c..ee9977eb27af427db1246877271fa0b977929ecd
--- 1/units/remount-rootfs.service
--- 2/units/remount-rootfs.service
+++ b/units/remount-rootfs.service
@@@ -10,7 -10,8 +10,8 @@@ Description=Remount Root F
  DefaultDependencies=no
  Conflicts=shutdown.target
  After=systemd-readahead-collect.service systemd-readahead-replay.service fsck-root.service
- Before=local-fs.target shutdown.target mountoverflowtmp.service
 -Before=local-fs-pre.target local-fs.target shutdown.target
++Before=local-fs-pre.target local-fs.target shutdown.target mountoverflowtmp.service
+ Wants=local-fs-pre.target
  
  [Service]
  Type=oneshot