Merge commit 'krkeegan/master'