Sync'd branch integration/b2g-inbound with upstream @ Tue Aug 26 13:12:47 PDT 2014