Sync'd branch integration/fx-team with upstream @ Sun Oct 12 08:25:39 PDT 2014