Vanilla development commits: e578c6cb39 c575f09c4b Also synced spacing and tabs from: 73d557806e
e578c6cb39
c575f09c4b
73d557806e