Sync'd branch integration/b2g-inbound with upstream @ Sun Aug 24 23:53:36 PDT 2014