Sync'd branch integration/inbound with upstream @ Tue Oct 21 18:35:38 PDT 2014