Merge pull request #1 from instructure/stable

Pull from Instructure Stable