Merged with master to get bugfix