Sync'd branch integration/fx-team with upstream @ Sat Oct 11 20:25:39 PDT 2014