Sync'd branch integration/b2g-inbound with upstream @ Sat Aug 30 02:59:25 PDT 2014