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