Sync'd branch integration/b2g-inbound with upstream @ Fri Aug 22 19:12:09 PDT 2014