Sync'd branch integration/b2g-inbound with upstream @ Sun Aug 31 18:46:35 PDT 2014