Sync'd branch integration/fx-team with upstream @ Fri Oct 24 03:30:48 PDT 2014