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