Merge master into nyc-dev
authorPyry Haulos <phaulos@google.com>
Wed, 10 Feb 2016 18:45:26 +0000 (10:45 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 10 Feb 2016 18:45:26 +0000 (10:45 -0800)

Trivial merge