Sync'd branch integration/b2g-inbound with upstream @ Tue Sep  2 04:18:35 PDT 2014