Sync'd branch integration/inbound with upstream @ Sun Nov  9 13:57:59 PST 2014