Sync'd branch integration/fx-team with upstream @ Sat Oct 25 21:23:00 PDT 2014