Sync'd branch integration/inbound with upstream @ Fri Oct  3 14:31:42 PDT 2014