I'm going to leave this branch alone until they get the bugs with 1.1.5 worked out.