Sync'd branch integration/b2g-inbound with upstream @ Sat Aug 30 13:53:36 PDT 2014