Sync'd branch integration/b2g-inbound with upstream @ Mon Sep  8 14:03:30 PDT 2014