Sync'd branch integration/fx-team with upstream @ Sun Sep 21 23:02:42 PDT 2014