upstream/2.0.3+git20150217
0a570742 · Merge pull request #2326 from yichengq/325 ·