Use pre-increment in iterators
Merge remote-tracking branch 'origin/resources' into Android