Sync'd branch integration/fx-team with upstream @ Fri Oct 17 11:06:32 PDT 2014