Sync'd branch integration/b2g-inbound with upstream @ Tue Aug 26 10:04:35 PDT 2014