Sync'd branch integration/inbound with upstream @ Fri Oct  3 01:53:41 PDT 2014