Merge remote-tracking branch 'refs/remotes/atom/master'
authorEran Tiktin <eran.t@mce-sys.com>
Sat, 10 Oct 2015 03:01:01 +0000 (06:01 +0300)
committerEran Tiktin <eran.t@mce-sys.com>
Sat, 10 Oct 2015 03:01:01 +0000 (06:01 +0300)

Trivial merge