Sync'd branch integration/b2g-inbound with upstream @ Fri Aug 29 00:58:38 PDT 2014