merge in ics-release history after reset to master
2 files changed