Merge mmn's 'nightly' changes
authorMikael Nordfeldth <mmn@hethane.se>
Mon, 18 Aug 2014 08:23:18 +0000 (10:23 +0200)
committerMikael Nordfeldth <mmn@hethane.se>
Mon, 18 Aug 2014 08:23:18 +0000 (10:23 +0200)

Trivial merge