* Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into api_fix

* test=release/1.6, test=document_fix