Sync'd branch integration/fx-team with upstream @ Tue Oct 21 16:46:43 PDT 2014