changes to beginning of 3.1
Merge branch 'master' of https://github.com/elenam/mics2014reducers