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