Remove outdated workarounds from boost/iterator.hpp.
Merge branch 'develop'