Sync'd branch integration/inbound with upstream @ Mon Oct 27 13:12:50 PDT 2014