Sync'd branch integration/fx-team with upstream @ Sat Nov  1 07:13:31 PDT 2014