Sync'd branch integration/fx-team with upstream @ Sat Oct 25 11:10:42 PDT 2014