Sync'd branch integration/fx-team with upstream @ Fri Oct 10 04:09:40 PDT 2014