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