Sync'd branch integration/b2g-inbound with upstream @ Sat Aug 30 23:19:35 PDT 2014