Sync'd branch integration/fx-team with upstream @ Fri Oct 17 09:51:46 PDT 2014