Merge remote-tracking branch 'atom/master'
authorjoshaber <joshaber@gmail.com>
Sun, 20 Sep 2015 21:46:36 +0000 (22:46 +0100)
committerjoshaber <joshaber@gmail.com>
Sun, 20 Sep 2015 21:46:36 +0000 (22:46 +0100)

Trivial merge