Sync'd branch integration/fx-team with upstream @ Sat Oct 11 19:34:42 PDT 2014