Avoid GCC 4.9 strict-overflow warning
merge of 'ae7e800adaf5627c6033a09814b7e3644e7d92b7'
     and 'b0a68aa4287f0ccf387bb9e9196d4aa1a682fe77'