Sync'd branch integration/inbound with upstream @ Sat Oct  4 01:55:40 PDT 2014