Sync'd branch integration/b2g-inbound with upstream @ Tue Oct  7 21:07:42 PDT 2014