Sync'd branch integration/inbound with upstream @ Tue Oct  7 05:12:48 PDT 2014