Sync'd branch integration/fx-team with upstream @ Fri Oct 10 21:08:45 PDT 2014