Git commits in Moodle 2.9.6 by David Risner

commit 54df1bdcf79770dde080ad0c30a7432199ed31e9
Author: David Risner <drisner@calstate.edu>
Date:   Tue, 12 Apr 2016 07:28:55 +0800
Tag:    v2.9.6

MDL-53095 repository_merlot: change merlot url use https