Merge wip with master, cause it's stable now.