Merge pull request #1036 from davidebriani/forward-port-1.2-into-master

Merge pull request #1036 from davidebriani/forward-port-1.2-into-master #314