Sync'd branch integration/inbound with upstream @ Fri Oct 31 19:15:33 PDT 2014