warning fixes
Merge remote-tracking branch 'det-ios/master'
drag down