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