Sync'd branch integration/b2g-inbound with upstream @ Tue Sep  9 09:14:38 PDT 2014