Sync'd branch integration/b2g-inbound with upstream @ Tue Sep  9 20:53:39 PDT 2014