Sync'd branch integration/fx-team with upstream @ Fri Oct 24 01:59:43 PDT 2014