Sync'd branch integration/fx-team with upstream @ Sat Oct 18 13:12:42 PDT 2014