Sync'd branch integration/inbound with upstream @ Tue Oct 28 09:56:42 PDT 2014