Sync'd branch integration/inbound with upstream @ Tue Oct 28 02:08:41 PDT 2014