Sync'd branch integration/fx-team with upstream @ Sat Oct 18 05:44:42 PDT 2014