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