Sync'd branch integration/inbound with upstream @ Fri Oct 17 20:15:48 PDT 2014