Sync'd branch integration/fx-team with upstream @ Fri Oct 17 16:30:44 PDT 2014