Pull 2014-06-20

Pull from master repo.