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