Release with merged changes from the original flag pacakge go1.7.4