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