Sync'd branch integration/b2g-inbound with upstream @ Sun Aug 31 12:23:34 PDT 2014