Sync'd branch integration/b2g-inbound with upstream @ Tue Aug 26 21:04:25 PDT 2014