Merge commit '0e5f1863d1' into appveyor