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