Extend nullptr_t workaround to Intel C++.
Merge branch 'develop'