Sync'd branch integration/inbound with upstream @ Tue Oct  7 01:43:39 PDT 2014