Merge "Disbale ssl on redirect"