Merge branch 'MDL-25991_actionnav' of github.com:skodak/moodle