Merge commit 'v3.1' into fremantle-package