Rebase up

@prabinv @kevinsproles @texasag & @tsanko 

Please do not pull this in yet. I'll do it once I get travis to run and confirm it is fixed.

Thanks