Merge Kepler changes
15 files changed