Sync'd branch integration/inbound with upstream @ Sat Oct 25 14:28:38 PDT 2014