Sync'd branch integration/b2g-inbound with upstream @ Sun Aug 31 13:13:33 PDT 2014