Cedar

Pull cedar into master