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