Sync'd branch integration/fx-team with upstream @ Sat Oct 11 18:33:40 PDT 2014