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