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