Merged Open Atrium 7.x-2.0-alpha3