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