Sync'd branch integration/b2g-inbound with upstream @ Sat Aug 30 08:04:33 PDT 2014