Sync'd branch integration/fx-team with upstream @ Fri Oct 17 15:58:47 PDT 2014