merge in honeycomb-mr1-release history after reset to master