Merge pull request #3188 from alexandrubau/master
authorCheng Zhao <zcbenz@gmail.com>
Fri, 23 Oct 2015 12:13:00 +0000 (20:13 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Fri, 23 Oct 2015 12:13:00 +0000 (20:13 +0800)
Updated docs


Trivial merge