Merge "WORKAROUND FIX FOR GCC4.9.1"