Merge commits from daggs/master