Bring in changes from master to myrridin working branch