Add support for C++11 iterators
Merge remote-tracking branch 'origin/master'