Sync'd branch integration/inbound with upstream @ Fri Oct 17 02:11:47 PDT 2014