reconcile with Intel 15 release and gcc 5.0