Merge remote branch 'ithinksw/master' into release