Fix tuple which was set as a keyword
Fix nullptr_t which was set as a keyword
Merge remote-tracking branch 'oblitum/master' into HEAD