Fix build failure on GCC 5.4

Created by  Eelco Dolstra  on September 30, 2016
6LIYTMFU5UXNQWNZP63CXRWTN52AVOLXSHGEXMC2G3RY6L4XA45AC
Change contents