Sync'd branch integration/fx-team with upstream @ Tue Oct 28 02:33:47 PDT 2014