Merge remote-tracking branch 'upstream/release-3.0.x' into new_3.0.x

revert-dabc3590
Megala 8 years ago
commit e0a63f5f34

Diff Content Not Available