Merge Kepler changes
9 files changed