Sync'd branch integration/inbound with upstream @ Fri Oct 17 00:06:41 PDT 2014