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