Merge branch 'master' into logging2 - sway - i3-compatible Wayland compositor

commit 39a65a6181972d4d5d1e7bd08550727936ff28f7
parent 8ecb49067997c37c006cbc4e4a88c4a13f31fca7
Author: Drew DeVault <sir@cmpwn.com>
Date:   Thu, 20 Apr 2017 12:55:34 -0400

Merge branch 'master' into logging2

	sway i3-compatible Wayland compositor
	git clone https://git.awy.one/sway
	Log \| Files \| Refs \| README \| LICENSE