Sync'd branch integration/inbound with upstream @ Tue Oct 21 16:41:39 PDT 2014