Ticket #6187: Avoid infinite loop if eraseDeadCode does not remove anything (invalid goto into a dead loop's body).
Ticket #5625: Simplify constant ternary operator in template parameters.
Merge pull request #450 from simartin/ticket_6187

Ticket #6187: Avoid infinite loop if eraseDeadCode does not remove anything
Merge pull request #453 from simartin/ticket_5625

Ticket #5625: Simplify constant ternary operator in template parameters.
Merge branch 'master' into travis_gcc_testsuite