Compiled from 27581a3 - Fix redirect bug