ref: 4c220c4ac2302b6c0a535c1099f2d393d57049c6
parent: deccc54004cbe88ddbf8f3f951d3178dc0693189
parent: 6dbde8d731f221b027c0c60b772ba82dad759943
author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
date: Tue Jul 18 06:33:58 EDT 2017
Merge commit '6dbde8d731f221b027c0c60b772ba82dad759943' Fixes #3709