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