Sync'd branch integration/inbound with upstream @ Fri Oct 31 12:28:59 PDT 2014