Vincent Hardion - 2016-09-03

Attached patch < 815.patch