git-flow AVH 1.4.2

Closes #16876.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>