Sync'd branch integration/fx-team with upstream @ Fri Oct 17 07:43:50 PDT 2014