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