This issue is solved in master. You should merge.