Merged

fetched upstream and merged with master