Merge branch 'release/v0.21.0'
Merge tag 'vv0.21.0' into develop

iOS 8 support