work-around for msvc limitation that causes has_iterator<> to fail for structs named iterator. Only applies to msvc-10.0 and earlier.
Merge branch 'ericniebler-develop' into develop