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