Synched up with the latest private git. 13th Sept 2013