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