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