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