Sync'd branch integration/b2g-inbound with upstream @ Sat Aug 23 02:17:34 PDT 2014