Sync'd branch integration/b2g-inbound with upstream @ Fri Aug 29 11:23:37 PDT 2014