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