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