Hypatia Pull 13/11/14

Pull from Hypatia main