Merge pull request merges from xs64bit to master