Sync'd branch integration/fx-team with upstream @ Sat Oct 25 16:09:44 PDT 2014