Git commits in Moodle 3.0.4 by David Risner

commit 9f1b6babf0b3b30b354d3ce6be621ab106cf38c6
Author: David Risner <drisner@calstate.edu>
Date:   Tue, 12 Apr 2016 07:28:55 +0800
Tag:    v3.0.4

MDL-53095 repository_merlot: change merlot url use https