Merge pull request #1 from atom/master
authorHeilig Benedek <benecene@gmail.com>
Fri, 29 Jan 2016 23:14:40 +0000 (00:14 +0100)
committerHeilig Benedek <benecene@gmail.com>
Fri, 29 Jan 2016 23:14:40 +0000 (00:14 +0100)
update as upstream


Trivial merge