Merge/synchronise 2017-patches into master.
This takes on board the following MRs: !148 (merged), !147 (merged), !144 (merged), !143 (merged), !142 (merged), !141 (merged), !138 (merged), !137 (merged), !136 (merged).
This takes on board the following MRs: !148 (merged), !147 (merged), !144 (merged), !143 (merged), !142 (merged), !141 (merged), !138 (merged), !137 (merged), !136 (merged).