Sync'd branch integration/fx-team with upstream @ Fri Oct 24 11:09:09 PDT 2014