Sync'd branch integration/fx-team with upstream @ Sun Oct  5 09:54:45 PDT 2014