Sync'd branch integration/fx-team with upstream @ Fri Oct 10 13:39:40 PDT 2014