Sync'd branch integration/b2g-inbound with upstream @ Tue Sep  9 02:01:34 PDT 2014