Sync'd branch integration/fx-team with upstream @ Sat Oct 18 07:11:49 PDT 2014