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