Merge remote-tracking branch 'upstream/master'
authorSasha Goldshtein <goldshtn@gmail.com>
Sun, 7 Feb 2016 19:16:24 +0000 (11:16 -0800)
committerSasha Goldshtein <goldshtn@gmail.com>
Sun, 7 Feb 2016 19:16:24 +0000 (11:16 -0800)

Trivial merge