Sync'd branch integration/fx-team with upstream @ Sat Oct 11 16:38:43 PDT 2014