Sync'd branch integration/inbound with upstream @ Tue Oct  7 07:06:47 PDT 2014