Sync'd branch integration/inbound with upstream @ Tue Oct 14 00:11:40 PDT 2014