Sync'd branch integration/fx-team with upstream @ Sun Sep 28 13:11:39 PDT 2014