Sync'd branch integration/b2g-inbound with upstream @ Tue Aug 26 15:57:36 PDT 2014