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