Sync'd branch integration/inbound with upstream @ Sun Oct 19 13:51:42 PDT 2014