When 40 files must be merged

master mattyice commited on 9 Apr 2013