Update the incoming branch from 15/11/2013
Patch Module and Settings