Sync'd branch integration/b2g-inbound with upstream @ Sat Aug 30 17:20:32 PDT 2014