Update source from Oct 10, 2014 release