Update branch UKMO/dev_r5518_amm15_test to trunk at r5936 for merging compatibility with INGV wave coupling branch