Created by: heavengate

cherry-pick https://github.com/PaddlePaddle/PaddleDetection/pull/260 https://github.com/PaddlePaddle/PaddleDetection/pull/261 to release/0.2