Moved line info in header again
Remove SFINAE support for all unknown compilers
Merge commit 'bd5910ef9f758616111ba25df95ffd1c07673f5a' into merge-up-int
Merge commit '052dc18c768969cd2bd843ce35872a96d5fa8307' into merge-up-int

Conflicts:
	projects/SelfTest/TrickyTests.cpp