Merge pull request #2063 from darwin/missing-overrides
authorCheng Zhao <zcbenz@gmail.com>
Fri, 26 Jun 2015 13:49:57 +0000 (21:49 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Fri, 26 Jun 2015 13:49:57 +0000 (21:49 +0800)
Missing overrides


Trivial merge