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