Merge pull request #1485 from alexlamsl/merge-2.8.0
authorAlex Lam S.L <alexlamsl@gmail.com>
Thu, 23 Feb 2017 23:33:57 +0000 (07:33 +0800)
committerGitHub <noreply@github.com>
Thu, 23 Feb 2017 23:33:57 +0000 (07:33 +0800)
2.8.0 staging


Trivial merge