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