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