Sync'd branch integration/b2g-inbound with upstream @ Fri Aug 29 06:43:26 PDT 2014