ZC
Merge branch 'komisch'
ZC
Merge branch 'komisch'
iOS7
implicit conversion