Sync'd branch integration/b2g-inbound with upstream @ Fri Aug 29 00:41:41 PDT 2014