Backport changes from 1-3-stable. Closes #79

After 1.3.7 release, backport changes associated with the
compilation and the changelog itself.