Sync'd branch integration/inbound with upstream @ Fri Oct  3 07:55:38 PDT 2014