[Fortran-caf, committed] Merge trunk into branch

[Tobias Burnus]

        * Merge from the trunk: r208408 bis r208666.

Committed to the Fortran-caf branch, Rev. 208667.

Tobias