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