Sync'd branch integration/fx-team with upstream @ Sun Sep 14 18:37:37 PDT 2014