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