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