Sync'd branch integration/b2g-inbound with upstream @ Fri Aug 29 13:33:32 PDT 2014