gromacs 5.1.1 build fails with PS XE 2016 because of gcc 5.1 headers(?)

Trying to build gromacs using icc and icpc from Paralle Studio XE 2016 fails. I assume this a problem interacting with gcc 5 headers...

/usr/include/c++/5/bits/stl_iterator_base_types.h(154): error: name followed by "::" must be a class or namespace name
        typedef typename _Iterator::iterator_category iterator_category;
                         ^
          detected during:
            instantiation of class "std::__iterator_traits<_Iterator, void> [with _Iterator=int]" at line 163
            instantiation of class "std::iterator_traits<_Iterator> [with _Iterator=int]" at line 176 of "/home/xxxx/projects/gromacs-5.1.1/src/gromacs/topology/atomsbuilder.cpp"

I know you are aware of this problem but thought I'd throw another log on the fire since it has been your "number 1 priority" for going on 3 months now.

https://software.intel.com/en-us/forums/intel-c-compiler/topic/565143

Is there a workaround for this or other information.

Best wishes --Don