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