Sync'd branch integration/fx-team with upstream @ Sat Nov  1 18:25:37 PDT 2014