resolve small conflict
Merge branch 'nileshjagnik-master' into goaway-support