Sync'd branch integration/fx-team with upstream @ Tue Oct 28 18:29:41 PDT 2014