[Fortran-CAF][Fortran-DEV] Merge from the trunk into the branch

[Tobias Burnus]

I have merged the trunk into the Fortran-caf branch (as Rev. 211423) and 
into the Fortran-dev branch (as Rev. 211427).

Tobias