Update 20131107 from djf