fixed compile error (GCC48)
Merge remote-tracking branch 'origin/develop' into develop