Merge branch 'master' into no-blocking-browser
authorCheng Zhao <zcbenz@gmail.com>
Tue, 24 Sep 2013 02:09:35 +0000 (10:09 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Tue, 24 Sep 2013 02:09:35 +0000 (10:09 +0800)

Trivial merge