Sync'd branch integration/b2g-inbound with upstream @ Sat Aug 30 18:48:34 PDT 2014