Sync'd branch integration/b2g-inbound with upstream @ Fri Aug 29 07:05:36 PDT 2014