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