Sync'd branch integration/inbound with upstream @ Sun Oct 19 21:25:41 PDT 2014