Sync'd branch integration/fx-team with upstream @ Sun Oct 19 17:13:43 PDT 2014