Sync'd branch integration/inbound with upstream @ Fri Oct  3 13:51:43 PDT 2014