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