Sync'd branch integration/fx-team with upstream @ Sun Oct 19 15:43:46 PDT 2014