Sync'd branch integration/inbound with upstream @ Tue Oct  7 08:31:38 PDT 2014