Sync'd branch integration/fx-team with upstream @ Mon Sep  8 01:21:37 PDT 2014