Git merges in Moodle 2.8.7 by Andrew Nicols

commit c1b716ed30e8d83f4d009ea54d72b31186ef88f7
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 16 Jun 2015 12:22:59 +0800
Tag:    v2.8.7

Merge branch 'wip-MDL-50216-28' of git://github.com/abgreeve/moodle into MOODLE_28_STABLE


commit 62a20889ef678d3d6b5c54b96e9c856a6ecc2200
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 16 Jun 2015 11:34:57 +0800
Tag:    v2.8.7

Merge branch 'MDL-39353-28' of https://github.com/rtcn2/moodle into MOODLE_28_STABLE


commit ca37641c24fbd14870bc9b62c6899d115f57c8c1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 16 Jun 2015 07:58:42 +0800
Tag:    v2.8.7

Merge branch 'MDL-50380-28' of git://github.com/lameze/moodle into MOODLE_28_STABLE


commit 9b7d060c5ea7b811af27164396de82731cba0579
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 15 Jun 2015 16:04:56 +0800
Tag:    v2.8.7

Merge branch 'MDL-50459-28' of git://github.com/jleyva/moodle into MOODLE_28_STABLE


commit 81de8dc4c1281ba76721ed10c1648e019db33ce3
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 15 Jun 2015 15:17:57 +0800
Tag:    v2.8.7

Merge branch 'wip-MDL-50222-m28' of git://github.com/marinaglancy/moodle into MOODLE_28_STABLE


commit c7828a7e8944f6fdd825d8943e95ed85fac32fc5
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 15 Jun 2015 10:21:53 +0800
Tag:    v2.8.7

Merge branch 'MDL-50438-28' of git://github.com/mastnym/moodle into MOODLE_28_STABLE


commit 499c254bd91437e106f40b3f8a14dffaeee5fda8
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 15 Jun 2015 09:59:45 +0800
Tag:    v2.8.7

Merge branch 'MDL-50509-28-vartypo' of git://github.com/mudrd8mz/moodle into MOODLE_28_STABLE