Merge Kepler changes
11 files changed