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