Sync'd branch integration/fx-team with upstream @ Fri Oct 10 14:29:42 PDT 2014