Sync'd branch integration/inbound with upstream @ Fri Oct 24 10:31:48 PDT 2014