Merge bugfix from GCC: