Merge remote-tracking branch 'refs/remotes/atom/master'
authorEran Tiktin <eran.t@mce-sys.com>
Fri, 20 Nov 2015 17:25:23 +0000 (19:25 +0200)
committerEran Tiktin <eran.t@mce-sys.com>
Fri, 20 Nov 2015 17:25:23 +0000 (19:25 +0200)

Trivial merge